From 7479f142c13f0238b7b1621cb4a3ef8e286d0b56 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 2 Sep 2019 18:17:30 +0100
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---
 config_host.mk.in       |   1 +
 configure.ac            | Bin 466270 -> 466410 bytes
 solenv/gbuild/gbuild.mk |   2 ++
 3 files changed, 3 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index c416f3e0a3e..86eef7406b1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -82,6 +82,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
 export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
 export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 116dd34ec711fa33d34d9fe45cb375112966a718..2e7157815e47de2fe5cb41cb480c1d5c9b57e22c 100644
GIT binary patch
delta 168
zcmcb&OXk&XnT8g|7N!>F7M3lnhwjy9rYV%97MCdKRw(F~78mI!W#;Lp6lACCCY5I9
zq@?8}rWac)lw_plaVbE6hhvb7t6#ixK!BT%qkFJz0-9<CUETE55(SvNf{~qmN@|&Y
mUTIEF0#{llm!orhaHvyohz8goE`&+#`|q)C-+zy7z8wHn>^Uj`

delta 29
lcmaF0Tjt&_nT8g|7N!>F7M3lnhwioe-DlnIcb{#J9RSB=4CVj;

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 88904117200..6e6cc5a92f3 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -255,6 +255,8 @@ gb_GLOBALDEFS += \
 		ENABLE_LTO \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # Common environment variables passed into all gb_*Test classes:
-- 
2.30.2